Updated version 2017.9 from 'upstream/2017.9'
authorSimon McVittie <smcv@debian.org>
Fri, 28 Jul 2017 07:57:53 +0000 (08:57 +0100)
committerSimon McVittie <smcv@debian.org>
Fri, 28 Jul 2017 07:57:53 +0000 (08:57 +0100)
with Debian dir 9d76dedec54a0efc8c1ae98cd69f78c3b4453e4b


Trivial merge